Added patch from Jeff Franks <jcf@tpg.com.au> to add GET_CLASS macros to

Tue May 22 16:25:27 2001  Jonathan Blandford  <jrb@redhat.com>

	* gtk/gtktreeview*.h:
	* gtk/gtkcell*.h:
	* gtk/gtk*store.h:
	Added patch from Jeff Franks <jcf@tpg.com.au> to add GET_CLASS
	macros to all objects.

diff --git a/ChangeLog b/ChangeLog
index 87c23379e6b702cba24b0ef6b5cbac557a6c4f48..0df2c759485abee2c0e8d3a242c65e4fbb97f04c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tue May 22 16:25:27 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeview*.h: 
+       * gtk/gtkcell*.h:
+       * gtk/gtk*store.h:
+       Added patch from Jeff Franks <jcf@tpg.com.au> to add GET_CLASS
+       macros to all objects.
+
 Tue May 22 15:13:52 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkcellrenderertext.c

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 87c23379e6b702cba24b0ef6b5cbac557a6c4f48..0df2c759485abee2c0e8d3a242c65e4fbb97f04c 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+Tue May 22 16:25:27 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeview*.h: 
+       * gtk/gtkcell*.h:
+       * gtk/gtk*store.h:
+       Added patch from Jeff Franks <jcf@tpg.com.au> to add GET_CLASS
+       macros to all objects.
+
 Tue May 22 15:13:52 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkcellrenderertext.c

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 87c23379e6b702cba24b0ef6b5cbac557a6c4f48..0df2c759485abee2c0e8d3a242c65e4fbb97f04c 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Tue May 22 16:25:27 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeview*.h: 
+       * gtk/gtkcell*.h:
+       * gtk/gtk*store.h:
+       Added patch from Jeff Franks <jcf@tpg.com.au> to add GET_CLASS
+       macros to all objects.
+
 Tue May 22 15:13:52 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkcellrenderertext.c

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 87c23379e6b702cba24b0ef6b5cbac557a6c4f48..0df2c759485abee2c0e8d3a242c65e4fbb97f04c 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+Tue May 22 16:25:27 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeview*.h: 
+       * gtk/gtkcell*.h:
+       * gtk/gtk*store.h:
+       Added patch from Jeff Franks <jcf@tpg.com.au> to add GET_CLASS
+       macros to all objects.
+
 Tue May 22 15:13:52 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkcellrenderertext.c

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 87c23379e6b702cba24b0ef6b5cbac557a6c4f48..0df2c759485abee2c0e8d3a242c65e4fbb97f04c 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+Tue May 22 16:25:27 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeview*.h: 
+       * gtk/gtkcell*.h:
+       * gtk/gtk*store.h:
+       Added patch from Jeff Franks <jcf@tpg.com.au> to add GET_CLASS
+       macros to all objects.
+
 Tue May 22 15:13:52 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkcellrenderertext.c

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 87c23379e6b702cba24b0ef6b5cbac557a6c4f48..0df2c759485abee2c0e8d3a242c65e4fbb97f04c 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+Tue May 22 16:25:27 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeview*.h: 
+       * gtk/gtkcell*.h:
+       * gtk/gtk*store.h:
+       Added patch from Jeff Franks <jcf@tpg.com.au> to add GET_CLASS
+       macros to all objects.
+
 Tue May 22 15:13:52 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkcellrenderertext.c

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 87c23379e6b702cba24b0ef6b5cbac557a6c4f48..0df2c759485abee2c0e8d3a242c65e4fbb97f04c 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Tue May 22 16:25:27 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeview*.h: 
+       * gtk/gtkcell*.h:
+       * gtk/gtk*store.h:
+       Added patch from Jeff Franks <jcf@tpg.com.au> to add GET_CLASS
+       macros to all objects.
+
 Tue May 22 15:13:52 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkcellrenderertext.c

diff --git a/gtk/gtkcellrendererpixbuf.h b/gtk/gtkcellrendererpixbuf.h
index 14fd9b579979e4185b0784203f392d68b8e10d74..ccea90943cd758204d853d36eac9f406228fa68c 100644 (file)
--- a/gtk/gtkcellrendererpixbuf.h
+++ b/gtk/gtkcellrendererpixbuf.h
@@ -32,6 +32,7 @@ extern "C" {
 #define GTK_CELL_RENDERER_PIXBUF_CLASS(klass)          (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER_PIXBUF, GtkCellRendererPixbufClass))
 #define GTK_IS_CELL_RENDERER_PIXBUF(obj)               (GTK_CHECK_TYPE ((obj), GTK_TYPE_CELL_RENDERER_PIXBUF))
 #define GTK_IS_CELL_RENDERER_PIXBUF_CLASS(klass)       (GTK_CHECK_CLASS_TYPE ((obj), GTK_TYPE_CELL_RENDERER_PIXBUF))
+#define GTK_CELL_RENDERER_PIXBUF_GET_CLASS(obj)         (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_PIXBUF, GtkCellRendererPixbufClass))
 
 typedef struct _GtkCellRendererPixbuf GtkCellRendererPixbuf;
 typedef struct _GtkCellRendererPixbufClass GtkCellRendererPixbufClass;

diff --git a/gtk/gtkcellrenderertext.h b/gtk/gtkcellrenderertext.h
index 4ac2bd232a86f3d485c6c6d373d18a68c8547d74..58068ed9a2995dd4cc7b6e3c43087b6922ef226b 100644 (file)
--- a/gtk/gtkcellrenderertext.h
+++ b/gtk/gtkcellrenderertext.h
@@ -33,6 +33,7 @@ extern "C" {
 #define GTK_CELL_RENDERER_TEXT_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER_TEXT, GtkCellRendererTextClass))
 #define GTK_IS_CELL_RENDERER_TEXT(obj)         (GTK_CHECK_TYPE ((obj), GTK_TYPE_CELL_RENDERER_TEXT))
 #define GTK_IS_CELL_RENDERER_TEXT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), GTK_TYPE_CELL_RENDERER_TEXT))
+#define GTK_CELL_RENDERER_TEXT_GET_CLASS(obj)   (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_TEXT, GtkCellRendererTextClass))
 
 typedef struct _GtkCellRendererText      GtkCellRendererText;
 typedef struct _GtkCellRendererTextClass GtkCellRendererTextClass;

diff --git a/gtk/gtkcellrenderertextpixbuf.h b/gtk/gtkcellrenderertextpixbuf.h
index fa372b44756642a992367cc13f843293faa4277b..d739a53612963e57ff7cb0195696a4d6ea4a91a3 100644 (file)
--- a/gtk/gtkcellrenderertextpixbuf.h
+++ b/gtk/gtkcellrenderertextpixbuf.h
@@ -32,6 +32,7 @@ extern "C" {
 #define GTK_CELL_RENDERER_TEXT_PIXBUF_CLASS(klass)     (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER_TEXT_PIXBUF, GtkCellRendererTextPixbufClass))
 #define GTK_IS_CELL_RENDERER_TEXT_PIXBUF(obj)          (GTK_CHECK_TYPE ((obj), GTK_TYPE_CELL_RENDERER_TEXT_PIXBUF))
 #define GTK_IS_CELL_RENDERER_TEXT_PIXBUF_CLASS(klass)  (GTK_CHECK_CLASS_TYPE ((obj), GTK_TYPE_CELL_RENDERER_TEXT_PIXBUF))
+#define GTK_CELL_RENDERER_TEXT_PIXBUF_GET_CLASS(obj)    (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_TEXT_PIXBUF, GtkCellRendererTextPixbufClass))
 
 typedef struct _GtkCellRendererTextPixbuf GtkCellRendererTextPixbuf;
 typedef struct _GtkCellRendererTextPixbufClass GtkCellRendererTextPixbufClass;

diff --git a/gtk/gtkcellrenderertoggle.h b/gtk/gtkcellrenderertoggle.h
index b48470bc92b8c75e327a81cc084f440350b9542d..094258b7d68a95ba94ce5790f044d1f9eef64409 100644 (file)
--- a/gtk/gtkcellrenderertoggle.h
+++ b/gtk/gtkcellrenderertoggle.h
@@ -32,6 +32,7 @@ extern "C" {
 #define GTK_CELL_RENDERER_TOGGLE_CLASS(klass)          (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER_TOGGLE, GtkCellRendererToggleClass))
 #define GTK_IS_CELL_RENDERER_TOGGLE(obj)               (GTK_CHECK_TYPE ((obj), GTK_TYPE_CELL_RENDERER_TOGGLE))
 #define GTK_IS_CELL_RENDERER_TOGGLE_CLASS(klass)       (GTK_CHECK_CLASS_TYPE ((obj), GTK_TYPE_CELL_RENDERER_TOGGLE))
+#define GTK_CELL_RENDERER_TOGGLE_GET_CLASS(obj)         (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_TOGGLE, GtkCellRendererToggleClass))
 
 typedef struct _GtkCellRendererToggle GtkCellRendererToggle;
 typedef struct _GtkCellRendererToggleClass GtkCellRendererToggleClass;

diff --git a/gtk/gtkliststore.h b/gtk/gtkliststore.h
index 13eb37a61ccac3a3a55bac0a0541ede70e5e9bd3..61c806d93ba830ee89aa52f87c12fd4d1ce5c367 100644 (file)
--- a/gtk/gtkliststore.h
+++ b/gtk/gtkliststore.h
@@ -32,6 +32,7 @@ extern "C" {
 #define GTK_LIST_STORE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_LISTSTORE, GtkListStoreClass))
 #define GTK_IS_LIST_STORE(obj)        (GTK_CHECK_TYPE ((obj), GTK_TYPE_LIST_STORE))
 #define GTK_IS_LIST_STORE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), GTK_TYPE_LIST_STORE))
+#define GTK_LIST_STORE_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_LIST_STORE, GtkListStoreClass))
 
 typedef struct _GtkListStore       GtkListStore;
 typedef struct _GtkListStoreClass  GtkListStoreClass;

diff --git a/gtk/gtktreemodelsort.h b/gtk/gtktreemodelsort.h
index ef0518305c9c703a881eff3f52360b0f5999ac76..192e030d3034b49516862a5ad0185f578967fed9 100644 (file)
--- a/gtk/gtktreemodelsort.h
+++ b/gtk/gtktreemodelsort.h
@@ -31,6 +31,7 @@ extern "C" {
 #define GTK_TREE_MODEL_SORT_CLASS(klass)               (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TREE_MODEL_SORT, GtkTreeModelSortClass))
 #define GTK_IS_TREE_MODEL_SORT(obj)                    (GTK_CHECK_TYPE ((obj), GTK_TYPE_TREE_MODEL_SORT))
 #define GTK_IS_TREE_MODEL_SORT_CLASS(klass)            (GTK_CHECK_CLASS_TYPE ((obj), GTK_TYPE_TREE_MODEL_SORT))
+#define GTK_TREE_MODEL_SORT_GET_CLASS(obj)              (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_TREE_MODEL_SORT, GtkTreeModelSortClass))
 
 typedef struct _GtkTreeModelSort       GtkTreeModelSort;
 typedef struct _GtkTreeModelSortClass  GtkTreeModelSortClass;
@@ -73,7 +74,7 @@ GtkTreeModel *gtk_tree_model_sort_get_model      (GtkTreeModelSort  *tree_model)
 GtkTreePath  *gtk_tree_model_sort_convert_path   (GtkTreeModelSort  *tree_model_sort,
                                                  GtkTreePath       *child_path);
 
-/* not implemented */
+/* FIXME: not implemented yet */
 void          gtk_tree_model_sort_convert_iter    (GtkTreeModelSort  *tree_model_sort,
                                                    GtkTreeIter       *sort_iter,
                                                    GtkTreeIter       *child_iter);

diff --git a/gtk/gtktreeselection.h b/gtk/gtktreeselection.h
index aaafa5057dcfbb8c37a3f2610a2a2e121a9be41b..104cb73dfa6eabb0d5d7835f446c70bf2e3717c1 100644 (file)
--- a/gtk/gtktreeselection.h
+++ b/gtk/gtktreeselection.h
@@ -32,6 +32,7 @@ extern "C" {
 #define GTK_TREE_SELECTION_CLASS(klass)                (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TREE_SELECTION, GtkTreeSelectionClass))
 #define GTK_IS_TREE_SELECTION(obj)             (GTK_CHECK_TYPE ((obj), GTK_TYPE_TREE_SELECTION))
 #define GTK_IS_TREE_SELECTION_CLASS(klass)     (GTK_CHECK_CLASS_TYPE ((obj), GTK_TYPE_TREE_SELECTION))
+#define GTK_TREE_SELECTION_GET_CLASS(obj)       (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_TREE_SELECTION, GtkTreeSelectionClass))
 
 typedef enum
 {

diff --git a/gtk/gtktreestore.h b/gtk/gtktreestore.h
index 024059701952494547162b00c7b1cf9f6120b2a2..76c6ff63fcb2ca412ae654ab5d17af74a04460ff 100644 (file)
--- a/gtk/gtktreestore.h
+++ b/gtk/gtktreestore.h
@@ -33,6 +33,7 @@ extern "C" {
 #define GTK_TREE_STORE_CLASS(klass)            (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TREE_STORE, GtkTreeStoreClass))
 #define GTK_IS_TREE_STORE(obj)                 (GTK_CHECK_TYPE ((obj), GTK_TYPE_TREE_STORE))
 #define GTK_IS_TREE_STORE_CLASS(klass)         (GTK_CHECK_CLASS_TYPE ((obj), GTK_TYPE_TREE_STORE))
+#define GTK_TREE_STORE_GET_CLASS(obj)           (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_TREE_STORE, GtkTreeStoreClass))
 
 typedef struct _GtkTreeStore       GtkTreeStore;
 typedef struct _GtkTreeStoreClass  GtkTreeStoreClass;

diff --git a/gtk/gtktreeview.h b/gtk/gtktreeview.h
index 4a63b9a053a95c9186d2be46f5f706f15601f604..432e8e2f09d99a43b3e01414cf27fced0b607639 100644 (file)
--- a/gtk/gtktreeview.h
+++ b/gtk/gtktreeview.h
@@ -45,6 +45,7 @@ typedef enum
 #define GTK_TREE_VIEW_CLASS(klass)     (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TREE_VIEW, GtkTreeViewClass))
 #define GTK_IS_TREE_VIEW(obj)          (GTK_CHECK_TYPE ((obj), GTK_TYPE_TREE_VIEW))
 #define GTK_IS_TREE_VIEW_CLASS(klass)  (GTK_CHECK_CLASS_TYPE ((obj), GTK_TYPE_TREE_VIEW))
+#define GTK_TREE_VIEW_GET_CLASS(obj)    (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_TREE_VIEW, GtkTreeViewClass))
 
 typedef struct _GtkTreeView           GtkTreeView;
 typedef struct _GtkTreeViewClass      GtkTreeViewClass;

diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index cbfac183b51a3f24e9e24aabd955b97e552364b8..824f1c19c994aabd116ec52a108048449989247d 100644 (file)
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -296,7 +296,6 @@ gtk_tree_view_column_init (GtkTreeViewColumn *tree_column)
   tree_column->property_changed_signal = 0;
   tree_column->sort_clicked_signal = 0;
   tree_column->sort_column_changed_signal = 0;
-  tree_column->clickable_signal = 0;
   tree_column->sort_column_id = -1;
   tree_column->reorderable = FALSE;
   tree_column->maybe_reordered = FALSE;

diff --git a/gtk/gtktreeviewcolumn.h b/gtk/gtktreeviewcolumn.h
index 394e2aedec3e966d46d045571ffead6bf4159894..2ee09b77dbb99341b8d26fff9de8b3fa3d0f9b88 100644 (file)
--- a/gtk/gtktreeviewcolumn.h
+++ b/gtk/gtktreeviewcolumn.h
@@ -34,6 +34,7 @@ extern "C" {
 #define GTK_TREE_VIEW_COLUMN_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TREE_VIEW_COLUMN, GtkTreeViewColumnClass))
 #define GTK_IS_TREE_VIEW_COLUMN(obj)        (GTK_CHECK_TYPE ((obj), GTK_TYPE_TREE_VIEW_COLUMN))
 #define GTK_IS_TREE_VIEW_COLUMN_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), GTK_TYPE_TREE_VIEW_COLUMN))
+#define GTK_TREE_VIEW_COLUMN_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_TREE_VIEW_COLUMN, GtkTreeViewColumnClass))
 
 typedef enum
 {
@@ -64,7 +65,6 @@ struct _GtkTreeViewColumn
   GdkWindow *window;
   gfloat xalign;
   guint property_changed_signal;
-  guint clickable_signal;
 
   gint width;
   gint requested_width;

diff --git a/tests/testtreecolumns.c b/tests/testtreecolumns.c
index af95e5e39b5ef282966f547ae915035b7c9100ba..eabfb3b0bd8cb411727079ca0fcfdc7ff091bc32 100644 (file)
--- a/tests/testtreecolumns.c
+++ b/tests/testtreecolumns.c
@@ -34,10 +34,6 @@ struct _ViewColumnModelClass
   GObjectClass parent_class;
 };
 
-static void view_column_model_class_init (ViewColumnModelClass *model)
-{
-}
-
 static void view_column_model_init (ViewColumnModel *model)
 {
   model->stamp = g_random_int ();
@@ -243,7 +239,7 @@ view_column_model_get_type (void)
        sizeof (GtkListStoreClass),
        NULL,           /* base_init */
        NULL,           /* base_finalize */
-        (GClassInitFunc) view_column_model_class_init,
+        NULL,          /* class_init */
        NULL,           /* class_finalize */
        NULL,           /* class_data */
         sizeof (GtkListStore),